From d5bd9fe27e7cc59c084fa8c32df6716b15051b95 Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Wed, 21 Jun 2017 12:36:18 +0100 Subject: [PATCH] xen: Replace ASSERT(0) with ASSERT_UNREACHABLE() No functional change, but the result is more informative both in the code and error messages if the assertions do get hit. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Julien Grall Acked-by: Konrad Rzeszutek Wilk --- xen/arch/arm/mm.c | 4 ++-- xen/common/tmem_xen.c | 4 ++-- xen/drivers/passthrough/amd/iommu_acpi.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 411bab1ea9..018f44a6d1 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -1154,7 +1154,7 @@ void arch_dump_shared_mem_info(void) int donate_page(struct domain *d, struct page_info *page, unsigned int memflags) { - ASSERT(0); + ASSERT_UNREACHABLE(); return -ENOSYS; } @@ -1166,7 +1166,7 @@ int steal_page( int page_is_ram_type(unsigned long mfn, unsigned long mem_type) { - ASSERT(0); + ASSERT_UNREACHABLE(); return 0; } diff --git a/xen/common/tmem_xen.c b/xen/common/tmem_xen.c index 06ce3ef129..725ae93b74 100644 --- a/xen/common/tmem_xen.c +++ b/xen/common/tmem_xen.c @@ -34,14 +34,14 @@ static DEFINE_PER_CPU_READ_MOSTLY(void *, scratch_page); static inline void *cli_get_page(xen_pfn_t cmfn, unsigned long *pcli_mfn, struct page_info **pcli_pfp, bool_t cli_write) { - ASSERT(0); + ASSERT_UNREACHABLE(); return NULL; } static inline void cli_put_page(void *cli_va, struct page_info *cli_pfp, unsigned long cli_mfn, bool_t mark_dirty) { - ASSERT(0); + ASSERT_UNREACHABLE(); } #else #include diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index d8a9205784..f4c7206c2a 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -818,7 +818,7 @@ static u16 __init parse_ivhd_device_special( hpet_sbdf.init = HPET_IVHD; break; default: - ASSERT(0); + ASSERT_UNREACHABLE(); break; } break; -- 2.30.2